From: Greg Kroah-Hartman Date: Thu, 17 Feb 2011 17:56:40 +0000 (-0800) Subject: Merge 2.6.38-rc5 into usb-next X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~14920^2~147 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=66b0835e2bb3d345f060a47bb8c8f883bd25ec2b;p=linux-4.9.git Merge 2.6.38-rc5 into usb-next This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell. Signed-off-by: Greg Kroah-Hartman --- 66b0835e2bb3d345f060a47bb8c8f883bd25ec2b